From: Matthias Clasen Date: Tue, 15 Jul 2008 05:29:41 +0000 (+0000) Subject: Unset the image when the label is set to "(None)". Reported by Neil X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~428^2^2~31649 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b0ac0f978e05a1b13368dfef8f8f1724c776851f;p=gtk4.git Unset the image when the label is set to "(None)". Reported by Neil * gtk/gtkfilechooserbutton.c (update_label_and_image): Unset the image when the label is set to "(None)". Reported by Neil Roberts svn path=/trunk/; revision=20833 --- diff --git a/ChangeLog b/ChangeLog index 7664d9dc29..11ee415dcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-07-15 Matthias Clasen + Bug 488766 – GtkFileChooserButton doesn't clear icon after + gtk_file_chooser_unselect_all + + * gtk/gtkfilechooserbutton.c (update_label_and_image): Unset + the image when the label is set to "(None)". Reported by + Neil Roberts + * tests/testfilechooserbutton.c: Add an "Unselect all" button. 2008-07-15 Matthias Clasen diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 5647ccc30c..1967d4989f 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -2387,12 +2387,15 @@ out: g_free (label_text); } else - gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME)); + { + gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME)); + gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL); + } } /* ************************ * - * Child Object Callbacks * + /* Child Object Callbacks * * ************************ */ /* File System */